projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d28d79 962e7da)
bitkeeper revision 1.1604 (429c27853YjCcOkLEnjS5rFvk6ORlQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 08:59:49 +0000 (08:59 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 08:59:49 +0000 (08:59 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

1  2 
tools/python/xen/xend/XendRoot.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xend/XendRoot.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.